Merge from trunk.
authorDavid Engster <dengste@eml.cc>
Wed, 13 Mar 2013 21:56:55 +0000 (22:56 +0100)
committerDavid Engster <dengste@eml.cc>
Wed, 13 Mar 2013 21:56:55 +0000 (22:56 +0100)

Trivial merge